Don't override install-info anymore.

diff --git a/debian/bin/info/install-info b/debian/bin/info/install-info
deleted file mode 100644 (file)
index ff18a51..0000000
--- a/debian/bin/info/install-info
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-# Dummy script to fool emacs install into thinking it did something useful.
-
-exit 0

diff --git a/debian/changelog b/debian/changelog
index b6a1700b15941f84787a02f6fae0b4107378fefc..5e8faf9c3fe43b9110d9a0fa6d407e752a828cc6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,7 +16,9 @@ emacs22 (22.1+1-3) unstable; urgency=low
     (#455432) and a bug introduced by an incomplete initial patch
     (#456235).
 
- -- Rob Browning <rlb@defaultvalue.org>  Sun, 24 Feb 2008 21:52:24 -0800
+  * Don't override install-info anymore. (closes: #438695)
+
+ -- Rob Browning <rlb@defaultvalue.org>  Sun, 02 Mar 2008 10:55:51 -0800
 
 emacs22 (22.1+1-2) unstable; urgency=low
 

diff --git a/debian/rules b/debian/rules
index 9d78b47570cf6f74687e8a1f36c1b4b6a6da6eec..18a17c3f096b0f0f43d526b9c2978eeaaf1ea8a4 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -303,7 +303,7 @@ endef
 # INSTALL_STRIP="-s" to the make vars below.
 
 emacs_inst = (cd debian/$(1) && \
-  PATH=$(CURDIR)/debian/bin/info:$(PATH) $(MAKE) install \
+  $(MAKE) install \
     DESTDIR=$(2) \
     infodir=/usr/share/info/emacs-$(major_ver) \
     localstatedir=/var \
@@ -562,7 +562,6 @@ debian/stamp/setup: debian/stamp/patch
        $(checkdir)
        cp /usr/share/misc/config.sub .
        cp /usr/share/misc/config.guess .
-       $(pf); find debian/bin -type f | xargs chmod 775
        mkdir -p $(dir $@) && touch $@
 
 # common configure flags